Test refactoring.
Removed unused code.
Removed check.