Added more logging information.
Removed uneccessary annotation