Remove the previously added commands and include them in the system wide short cuts as they are more appropriate there. Also, make sure to eliminate any duplicate commands. This is a part of issue #7