Legacy Paint dependancy removed