Deleted old code that I missed
Merge branch 'dev'