Jeh cleanup4 feb14