focus: slight code cleanup.

factored out focus relevant stuff into their own header.
focus: deleted unused code.