remove static and move