Fixed build errors, removed scala support