removed obsolete code + comments