got rid of extra imports in classes