Clean up deferred load processing.

Change-Id: Ic82bee2176d7d1123e9645eb1bcefd496dfdc577