Clean up of Sample Spaces to work in 2013