added new CPP gen scripted and more class cleaning