Remove unused file
Merge branch '961-folder_creation' into develop