Remove layoutmodel dependency