Revert "Return to production code to merge with master"

This reverts commit d4bc3c0b5d6f92571eb1efd38e9a6731faac0d59.
Modify .gitignore