Just making everything consistent and cleaning out things we don't need to debug anymore.