Reviewed code, removed fixed TODOs (not fix TODOs are still numerous)