Cleanup redundant deletes; doc some methods