Minor update and remove old stuffs