removed obsolote code