removed unused code and added defaults synch
Merge pull request #62 from amychiu/amy/development2

removed unused code and added defaults synch