Merge pull request #61 from amychiu/amy/development2

quick fix to prevent app from crashing if terminate during delete
Merge pull request #62 from amychiu/amy/development2

removed unused code and added defaults synch