Remove some statics