removed explicit dependencies + more