Cleaning up and perf