cleanup and helix skeleton stuff