php-horde-content: clanups