Removed remnants from manual merge