Remove active_support as well