Removed legacy
Added production and development configuration options