improved diff calculations, deps removal