Remove what is not needed, export fresh version to fix #2