Save space in fully enabled version