Removed unused function, removed console.log for live