removed prints and dead code