removed some prints and comments