Clean up debug prints, dead comments, offilne hack