MAINT use common helper
MAINT remove unecessary variable