fixed removal & registration