Cleanup console.log calls; handle clean load scenario