remove active_support
refactor part 2