Removed deprecated property setting code
Implemented Issue #7