Removing extra unused code.