Removed unused code and duplicate variables.
1 file changed