removed unneeded code (I hope)