Removed unneeded static thingys