removed functions
cleaned up aliases
cleanup
if condition for proxy settings