Fixing janitor mode