Removed Unnessasary code