Removed sugarrecord
Some fixes