refactored unused fields