Cleaning up some cruft, renamed rmax to rcut and added rcutcn