U2: cleanup.
U2: cleanup.

jlhughes/foam,mdittmer/foam,jlhughes/foam,mdittmer/foam,jacksonic/foam,mdittmer/foam,mdittmer/foam,jacksonic/foam,jlhughes/foam,jacksonic/foam,foam-framework/foam,jlhughes/foam,foam-framework/foam,foam-framework/foam,jacksonic/foam,foam-framework/foam,foam-framework/foam