Removed todo macros and included todonotes