Add in some selectivity--education, for example--and the ability to support oneself (or a support guarantee from a legal resident that is enforced). Stop pandering to national or racial interest groups. Eliminate the g-damned immigration lottery!
We need to scrap the welfare state, or at the very least make it available only to citizens.