Remove unused usings
Minor changes
Include new sourcefiles
Revert "Install J832 lib"

This reverts commit 40d7f957148a60bdeab7fd27b22ae0630fe356e1.