Removed commented out code, CORE-435