(Maint) Remove unused code