Removed some dead code in the constructor.