Fix doc comments and remove unneeded usings