Major cleanup after merge