Deleting uneccesary stuff, adding things to TODO

(Sunny's TODO)