Removed unnecessary vehicle container & accessors