init: clean up redundant stuff