removed entity functions and unit tests for utilizing property. Cleaned comments