import cleanups, testing functions no longer dependent but stil connecting to wrong db