Empty view change, some cleanup