Removing obsolte code