Rearrange utility methods, remove context information object (not used).