Remove dependencies on some activesupport components