Fixed bug in dynamic policy examples, some cleanup