remove the improper implementation on controller side