Work towards unifying unloading

Signed-off-by: Jack Huey kitskub@gmail.com