-Cleaned up unused code from last performance overhaul of object managers
Merge remote-tracking branch 'upstream/master'