Removing ServletBasedEnvironment