Remove activemodel dependency