cleaned up category mess (closes #1552)