Cleaned up raw DB