Removed unused dependencies; bugfixes