Rationalised use of onRestore and level initialisation
Removed commented-out code