Cleanup after removing the override array.

Minor cleanup.
Merge pull request #24 from mechaet/master

Cleanup after removing the override array.