Remove unused file
Fix import warnings