major cleanup of client cruft from migration