Remove Debugging Print Stmts, small edits