Removed unused code
Added docs/todo