Refactoring: code cleanup - unused fields