Removed old deprecated and commented/disabled code
Merge branch 'develop' of github.com:pandorafms/pandorafms into develop