Also move the delay loading code to another location as this isn't part of the RDI source, but was included there beforehand.
OJ