Got armor removal and return working