More doxygen work

More clean up