Moved general stuff to do-general-configuration.sh