Removed all old ways and fixed reference to use of "n" vs. "np".