Cleanup/existence checks etc...