Cleanup useless variable assignment