More refactoring, error list & remove rule fixes