removed unecessary code

merging it in