[FOLD] Remove abstract interface
[FOLD] de-inline and tidy