Removed unused variables.
Moved 1 to correct place.
More UserFullname fixes.