Add numbered option, i.e. index for each module and function
Remove Null functions

These functions have not been used at all