Added ability to remove structures