Remove commented-out blocks of code

Also add some real comments