Remove unnecessary code after last commit's renaming spree