More simplifications of code, especially to avoid citems