Some cleanup and disallow duplicate category creation