Make manifest as clean as possible