Removing config/environment requirement...?