Removing bad code
Merge branch 'development' into live