Move command-line section to regular use block from sandbox