Well, I've kept them there to make it easy to enable g09 support.