Removed xman, assorted cleanup