delete extra db ref
fix option handler instanceof