#660 - clean up initialization