Misc changes

Mostly cleanup remaining from my branch on @markovuksanovic repo.