Removed useless variable assignments