Remove unused uses
Add some missing docs