Removed some dead code; Turn on Instrument and Coverage options for debug builds