Removed unnecessary prints and checks