Remove unused constants
 Added support to set the initial search directory.