Removed todo in favor of github issues