Cleaned up after Commit Fiasco