back to root

back to Zipperposition

Code cleanup for 1.6