minor client-side cleanup