Removed custom environment-specific stuff