Updated to new version of janitor