Basically complete TaskRemove and related stuff