change extended message formats
remove obsolete classes