Code refactored and scp disabled