Cleanups and skel update