Some cleanup some mess up.