Cleanup old environment-specific junk