remove target and refactored authentication