Deide cleanups