Remove unneeded 'return' instructions