Remove legacy ctor and code cleanup.