Database class clean-up for performance