Remove comment out code :-)