cleanup and MSC added

cleanup and MSC added