Another cleanup of mess