Fix uninitialized variables and remove unused ones.

Fix uninitialized variables and remove unused ones. #181