Removes dead code
Removes ununsed import