Removing todo (moving to github issues)