more cleanups on ada