07/09/14 cleanup