Code cleanup
Comment code and remove debugging printfs