Deleted file and refactor