Removing no longer needed XPS project.
Clean up some code in display.c and make it a bit more efficient.