removing some stuff to test if performance is better