* further cleaning up