Remove experimental code that was causing issues, cleaner log output