removed unnesseary code