more removal of C style code