Cleaned up db