WIP removing debug/todo, doc updates, bleach