Updated janitor