CAP : Removed un-needed records