* further cleanup