removed depricated code, and updated todo list