dumb cleanup and test boss 2