Remove old code
Avoid some string constants