Remove deprecated arbitrary instance attribute use, may need to find a way to memoize later