Addressed code-analysis errors.
Removed the unnecessary property