Updates and cleanups