Cleaned up content not being used
Merge branch 'develop-ricky' into develop