Just some small cleanup hoping to figure out where the crash is coming from