Ripped out more code

Rebuilt docs and NAMESPACE