Some code cleanup. Removed some unnecessary declarations, etc.
More cleanup of code.