City to take over fire cleanup of annex left undone by Oaklawn Inn's owner