Elminated unnecessary statics.

Change-Id: I677dd15041288b7075fefd7c737885603ce6e5db