Government to end non-crime hate incidents