Remove unnecessary directories in templates dir
Remove trailing whitespaces