Remove constant inlining
WIP ...