Removed verbose logging
Commenting out not ready stuff