Added removal of boundaries and no-fly zones