rm unused imports and obsolete methods