Rodrigo - cleanup clode