Can we get rid of the commented out old versions?