Remove Controller references