Remove debug statements and support ST3; Issue #3