Cleanup unnecessary code from test programs