remove unused and improve coverage