Removing old TODOs
Adding email to author line for future support for any bugs
Completed TODO