Removing large chunk of unused code