Dynamic tasks etc: some cleanup