Remove reliance on Spree::Property, fix admin