Remove PAC Console and add Trebuchet and Calendar to Remover. Also cleanup.