Remove console.log and add clean-up