removing environment specific things; lot more to do
removing environment specific stuff