General cleanup - removing some statics and other cleanup