Richer space remove logic