removed all static