Clean-up of API

This should be the unproblematic stuff from #42 and #49.
It is mostly clean-up and removing unneeded macros