remove unused code
import cleanup