boyscout: removing unused fields