Normalize comments and whitespace to match D2X
Remove RCS comment to synchronize code with D2X
Remove RCS embedded string to synchronize code with D2X