remove debugging; minor cleanup