file deletions from public and refactoring