202 and 206 Cleanup