rm some now-unnecesssary code