Cleanups to DB model