Clean up old code