Minor speed, removed some prints