get rid of static declarations