More cleanup

Init messages, remove console.log