Remove commented-out variables
Include string.h for strlen and friends
More cleanups of dead code