preparing structure for full janitor implementation