Refactoring Models to remove Parse Dependencies