Boyscout: removed unused code