Remove unused stuff
Removing more unused code