Remove unused config variables
Reinstate staging variables