issues#next cleanup