Removed task components for complete re-write