Fix init auto-save hook, remove some irrelevant stuff