Cleanup scala code.