Clean up loader
Merge