Some update and some cleanup