Correct load order
Housecleaning