cleanup of the rename