Removed debug logging, added performance checks