Removed some needless comments, and got rid of the use of USE_X (assume that to be true and get rid of the alternatives).