Clean out obsolete code to address review comments

* Follow up to remove direct gecko dependency work