fixed dead code and import