Made some casts explicit to avoid compiler warnings.  Removed code that wasn't being used.  Update for 1.7.3.