Remove intermediate model, fix drawrect