remove initial $ from most model keys for #332