Dead Code removed - unused constants marked as deprecated
php 5.3 fixes
Merge branch 'rollenes-issue/proxy-native-refactor'