Removed all HIEM references from property files and database scripts - Part 2