Removed unneeded logging code
Removed some commenting used for testing