Remove paint dependency