Smorg garbage cleanup 8-30-15