Remove references to collection as it is now Resultset