Remove variable deprecations