add file to cleanup Drive project, and removed duplication in these related functions