improvements remove debugging