* removed uneeded lines in code around if/else statements
* removed recursive remove dir and generate string functions as they are included in the base