Adding crudflag to demand and removing some old functionality.