Some optimizations that speeds up task addition

Created by: marcus-oscarsson

Hi

Noticed that working with the sample grid have become slow again, removed some unnecessary calls that have sneaked in and optimized others.

Marcus