Delete some code and clean up some other code