Cleaning up/removing code.