more cleanup.

wow. feeling blind right now....