With obsolete parts removed