Removing unused code - WIP