Prune out a lot of the commented out code