Removing redundant/unused code.