Perform minor clean up