clean up skel stuff and simplify