remove useless return
BCF refactoring
remove non-used flag