some import cleanup. fixes some compilation errors