Reduced some redundant codes

VPN is not working, can’t test my code. Will try later