[prefix-sharing] Removed unused methods.
[prefix-sharing] Additional cleanup.