More cleanup

As we have separate scripts remove unneded stuff
Finally fixed static libs