Cleaned up simplex