This seems ugly to me. The render context classes should have a method to delete single surfaces.