removed obsolete dependencies
cleaned code