Remove Active Support dependency