Clean up
Upgarde to Foundation 4.2.3