Removal and small changes

Removed unnecessary data and changed the race to use only data created
during the session. Preparing for parse.com integration