[UPDATE] Some cleanup