CDAP-451 Remove gateway related code