Removed redundant residual re: reverted refactoring.