New database schema (cleanup)