[DB] Pre Rel19 Tidy up