Clean up before first basic extend release #151