Redesign. Removed centralized database management