Slight cleanup, need to determine logic for removing/adding to refset