code cleanup and refactoring. 4store moved from opentox-client.