Deleted unused code, added todos