Enable dynamic category setting
clean up