Cleaned up wrong or unused configuration, and replaced NPN with ALPN.