Add several cleanups