Update todo
Delete bunch of unused files and commented code
Other clean-up