Clean up todos

[ajkannan]

There are ~7-8 todo statements in the codebase, most of which don't have associated issues. We should create issues for them and address them when we get the chance.

[aozarov]

@mziccard do you mind to take care of the Storage todo's if there are any?

[mziccard]

I've already removed some. I'll take care of going through the code and report them as issues if need be.