Removing references to removed utility function + fixing missed instances of collection class + cleaning up documentation