Cleanup on appearance ~ core and Message Map changes