Keep clean/setup tasks separated