more cleanup

Ignore-this: 8257e3d8bab09c86478fb1493dd576c2

darcs-hash:20130526034146-c21fe-7f397569d43d63771f84175997dd031218e2e935