Fix shell buffer naming, remove obsolete conf vars