added more todo items
removed ahd, as its not public and nor expected anytime soon
removed last ahd references