Removed PropertyLoader references.