Fixed missing import
Very minor fixes
Removed obsolete module