refac:killed off statics