bugfixes removed some dependencies