Clean up code after previous commit