removed dependent classes which were deprecated before