Removed commented config and code