Cleanup in formatting + unused includes and declarations + removing the java sources, as it is being implemented in C.