Some more clean up fo old static values