Remove console logs add common js and cleanup