Removal of empty folders if self.cleanup is True, fixes #10, removed old code