Some homophobic discrimination will remain