remove debugging, split version out