Merge "Code cleanup including removing direct references to IMS classes."