addition to 1a6c8ca89c9ac53ac8021ba323df1a15dd8805ae:
remove unused code