More cleanups, fixed wasp