Remove unrequired statics