there are a number of mapped commands that are temporarily included in the lib, these need to be moved out