remove some code, make code more efficient (I hope)