General Cleanup of unused code

Comment out some stuff