PSR-4, remove typhoon, etc.