Again, remove the commented out stuff