Refactoring System check which was six year old code