[FIX] removed fillRecord and clean-up