Remove debuggin prints and some unused code.