remove special static handling