cleanup that mess