Cleanup from previous commit