Removed last vestiges of X and U. Closes Issue #32.