Removing customizations

Removing customations that don't belong to me.
Merge branch 'develop'