Removed unneeded code. Excluded some code from coverage.