ERT-605 Remove obsolete code