Simplifications from dake

+ Use new initialization stuff from dake for simplifications