removed obsolete things