[HAO-Tracker-2014-Primary] Cleaned up main.cpp, made some renaming

- Fragments of commented code have been removed
- clearAllPersistentData method has been renamed to
clearAllPersistentDataOnRequest, behaviour has been slightly modified