Cleaned up reams of unused code