removed TODO notes in favor of github issues