Clean up for first alpha release