Silence compiler warnings in core
Nuke unused imports
Revert "Fix annotation format"

This reverts commit 9f2adff23ff92c331bc26bbd5978e017a001edff.