Clean Up for v.2