Removed redundanct residual re: reverted refactoring.