Fix #25: clean up categories