Removing unused code and fixing missing import
Removing pdb and dead comments