Work in Progress

- Removed dead code
- Delete Document
- Few UI niggles fixed