Stripped out the tasks already done in 0.9.7