Here be a need to refactor.
Clean up database mess