Removed unecessary logging, and added some missing logging

Change-Id: I3eb1aee158b8a870986d01b96ff3b19361bfaa6e