REL-1301: Code cleanup.