WIP: removing sourcing of scripts