Refactoring - removing old db connection stuff