Removed commented out code
Logger improvements