Minor cleanup

Will void compatibility with previous builds as far as encryption goes!