Remove some of the categories (closes #27)