Cleanup Expectation.php