initial state cleanup

initial state cleanup