Got rid of some guard code that I THINK is no longer needed based on the changes made recently to how shapes are released.  Testing seems to bear out the idea that these are unnecessary.  Also removed some commented-out code.