Removed println statements and dead code