Removed few print statements and unused imports