Remove some deps leftovers & testsuite cleanup
further build cleanup