ADEN-738 Remove unneeded code