Removing unneeded dependencies and fixing dependency on eydis gapi