Continue deleting magic numbers