Removing export and init-system calls