Tidy up of dead code.
Added properties.