Minor changes to compile with clang
Remove unused code (was for mkn-with-derivatives)