Fix for when cleaning up surface picker type.