cleanup, public method.
Merge branch 'detached'