Removed testing code (to gist)
Removed todo