remove debugging and todo