removed obsolete code because of moving to different data model