Some cleanup, get SSL to be singular