improving logging.
fixing STORE-218
fixing STORE-222
removing unnecessary file.