Remove some dependencies and tidy docs