Removed some dead code resulting from the rebase. Cleaned up a few places, and removed xi2_find_containing_crtc which didn't belong with input code.