Minor cleanup. Major reason for committing is to check the branching with the database team.