Small additions to cleanup

Some cleanup, cleanup.  The delete pattern is now a module constant.