Removes a couple of unused properties, use proper equality and
don't re-assign the alternate binding.

Change-Id: Id97294825580ce743fc1d70fba9485b85335ef31
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>