clean up and debug removal

this appears to work without error now... debug removed.