Previous Task Team clean ups