Fixed some privates to internal.
Removed some unused statics.