Third Party and Bootstrap cleanup