cleanup for yesterday's fixes