Clean up and remove late initialization code that is no longer needed.