Remove test codes and make to use the environmet variables