reset uid when appropriate
remove old code
reinstate subtask info