removed one more unneeded dependency, cleaned up imports