cleanup commit 8/14/14