updated how we perform clean up...it is now contextual and project based