Removed a few printlines and unused variables