Fixed bug in comment out the wrong line during cleanup
0.2.21