Cleaned up code TODOs where they no longer applied =)