remove static keyword from const in core classes