Getting rid of some statics