Cleanup some stale definitions in the new database components