Removing unused import, cleanup