Fixup check/reset all, removed redundant files