Cleanup for git porcelain