Properly remove the load handler and a minor cleanup