Got rid of the mess