ARC support - aka: adding self. and removing code