Cleaning up for first Helix release