Remove inline statements, remove unused variable
Make the test suite compile again