Perform minor cleanup