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