feature/IN-489: Refactoring to remove unused code.