removed a few unused packages and adapted a few files