Remove active support, unsure why I had it in there to begin with
Merging