Removed uneasseary code