Cleanup code
Removed todo
Removed todo
Cleanup code and removed todo
Removed todo