Cleanup configure