Cleanup && set default version to 9.4