Remove helper classes