removing redundant code (I think)