Remove unused code and rename object