removed unused code and added defaults synch