remove #ifdef STEED

STEED code is now enabled uncoditionally as #ifdef inside if is a form of pure evil.

Includes also a bit or two of refactoring.