Removal: Remove unload function for now
Addition: Added modular calls so everything looks tidier