Remove unneccessaries

no longer using messages