Removing Obsolete folder and lingering references