added safeguardes to completely remove proxy