Minor changes

Unloading feature removed