Merged bash cleanup scripts; removed extra file