9/30/14 (finishing delete, update lib)