Removes STI from messages #238