Removed gabors name mapping and a few more