Added supported for user paths in sources for env-setup
Cleaned up aliases