remove $on/$off from internals