Move static to legacy
Truly move static to legacy