Issue IKTRE-103 by cableman: Removed all the old code