Remove gallery model and make more workie