We can start removing all the commented out stuff.