Additional cleanup, remove FastClick since it's buggy