Codecleanup unnecessary assignments