Remove unused pragma
Add some property checks.