Fixing reboot. Cleaned up some inconsistencies with using "delete" rather than "obj->Delete()".