Doc and dep cleanup