Remove extra prints and commented code