cleaning up hasty init