Remove manually copy-pasted files taken from cloonelgraphics and use the up-to-date version from the submodule instead.