Clean out old OGPX stuff
Add missing header guards
Crash fixes in model upload