Remove active support dependency
First working version