Fix clear function and remove enumerable interface