Minor update and junk clearing