removed uneccesary code