removed explicit dependencies
Merge pull request #178 from fluxtah/master

removed explicit dependencies + more