Some cleanup related to ajaxyness