Starting to remove custom drawing code.