More and more contend and cleanups