Some cleanup. All loads done
Merge