Remove irrelevant functionality