[FIX] Small cleaning