Do everything in cleanup obj
fix tests on 1.9