* fix unresolved reference warning and unused imports * revert stuff * just a commit to rerun the tests cuz messenger fail