Adding missing shells and removal of a duplicate user definition