remove old file and fix importing errors