clean up message classes