Various changes, remove NSA & snooper