progress on removing hammer.js