Remove obsolete include
Shuffle around some code