Rip out more unused code
Removing unused code