Cleanup unused code
Better display components name in docs page