unload and hide both handled; removing TODOs