some cleanning ; fix for history