Cleaning up code from previous commit