* Fix error * refactor: remove unused code --------- Co-authored-by: Rick Staa <rick.staa@outlook.com>