cleanup in mess