remove more testing stuff,..