remove unnecessary 'message' class