More clean up of Website options