Updating schemas and removing commented code
Merge pull request #9 from ehsavoie/master

Updating schemas and removing commented code