Removing older 0.7 code