Removed dead files. Tidied up todo and dead code blocks.