Getting rid of debug  methods