Initial modifications.  (Mostly removing features)