Lot of obsolete methods updated