Removed extra tasks