remove abstractions that are now not needed

and made the compilation way faster ;)