some cleanup

Ignore-this: 951f78e7e3980d91e54370fad1051d38

darcs-hash:20130526033345-c21fe-3eddda3f803511428f50d307ec1dc86273c6f94b