More code removal.  This is hopefully the end.