General source tidy-up.
Removing Typhoon for now.