cleanup, saner databag model