Cleanup Todo s and stuff