(maint) Remove redundant code