A/HRC/18/10 undertake a comprehensive review of national legislation to guarantee full implementation of the principle of non-discrimination as well as adopt a national strategy to mitigate against such a situation, as recommended by the Committee of the Rights of the Child in 2004; take all necessary measures to put an end to the practice of child soldiers (Spain); 80.24. Strengthen measures of prevention and fight against phenomena affecting the rights of the children, particularly child labour and violence against children (Morocco); 80.25. Undertake efforts to enforce the prohibitions on child labour, especially in its worst forms (Poland); 80.26. Take measures to tackle the exploitation of children, including domestic work, hazardous labour, especially in the mining sector, commercial sex and trafficking, starting with the ratification of the ILO Minimum Age Convention No. 138 and the ILO Convention No. 182 on Worst Form of Child Labour (Slovenia); 80.27. Amend the 2007 law on the rights of the child for a uniform and increased minimum age for work, and ensure, through dissuasive or repressive measures, notably within the framework of a law on human trafficking, that arduous work similar to the worst forms of exploitation is not given to this vulnerable category of people (Senegal); 80.28. Urgently address, the anomaly - accepted by the Government regarding citizenship status for residents of non-African descent (Ireland); 80.29. Develop a shelter system for victims of trafficking (United States); 80.30. Pay particular attention to the improvement of prison conditions (Algeria); 80.31. Take effective measures to reduce overcrowding in prisons and lengthy pre-trial detention as well as strengthen the judicial system including for juvenile offenders (Austria); 80.32. Take steps to strengthen legal aid programmes and speed up the scheduling of trial dates and provide for better living conditions in both prisons and detention centres (United States); 80.33. Improve the working conditions of judges and prosecutors, especially of prosecutors, in order to further strengthen their independence, and fill vacant positions for judges and prosecutors (Switzerland); 80.34. Continue to take effective measures to push forward the poverty alleviation strategy and ensure people’s basic human rights, such as the right to subsistence and the right to development (China); 80.35. Continue with the support and cooperation of the international community to fight poverty (Bangladesh); 80.36. Continue to apply programmes and measures to improve the enjoyment of the right to education and the right to health (Cuba); 80.37. Maintain the efforts to guarantee equal access to education, particularly for women and children (Chile); 80.38. Continue to ensure that programmes, services and support for HIVprevention will reach the general population (Netherlands); 15