Remove helper methods