Added/hacked ability to remove (some) layers