Remove comment out code