Major cleanup

removed printf and all unnecessary code