started cleaning up t odos