Cleanup old completes and bugfix