cleanup when actions are available fixes #802