Fixed API classes, but removed huge amounts of deprecated/unupdateable API
No more compile issues