Close #10: Remove redundant functionality