Remove redundant functionality