removed obsolete parts