cleared up the mess