BZ-1110208: more depednencies review + cleanup of assembly files