removed unnesssary code