Get rid of some unneeded concepts