Added CMAKE config bridge and cleaned out some unused things.