Removed unnecissary statics