Remove *all* references to armada and seagull...