Removed obsolecte code