Cleanup, fix recusion error.

Should always try running before committing...