minor cleanups for waiting list moved to resource

DATA MIGRATION MUST BE DONE