Refactored to Remove all Collections (Merge after Prior Pull Request)

- Removed collection files.
- Removed references to collection files.