Removed more unused imports. Removed dependency on remote services