Clean up leftover code
Put scala version into artifact name