heroicleap key + options cleanup