Fixes: 1) Remove unnecessary imports related to the deleted functionality. Extra: 1) Extensive cleanup to remove redundant code and references; 2) Minor formatting adjustments for improved readability.