Removed obsolte code