Fixed issue with removal from Vehicle XML, now using List with single Lock