Removed todos and ideas