remove check message when apply
optimize code on apply controller