Cleaning message classes