Fix ADL
Remove assembly