Code cleanup

Some stuff being reordered
Cleanup

Some stuff being removed finally ...
VID_ declarations

VID_ declarations are known by the refresh.