rm accidental file addtions and misc cleanup