Code clean up, removed print statements
Removed more print statements