removed uneccasary code