Remove unused block and bump version to 2.0.7