jquery 1.11, and more cleanup