Further cleaning, first addition to other_stage