BZ-1110208: dependencies review and alignment + cleanup of assembly files