Cleanup

Delete old code

"Sorry, we could not display the entire diff because too many files (2,322) changed." << FTW