removed some statics