Made sure cancel and close buttons also use the remove function to get rid of id problems
Merge pull request #646 from swuest/correct_garbage_collection

Added two litte fixes to the editor garbage collection