clean-up, removed _ dependency