Clean-up changes not related to Quantum
Merge pull request #6 from inakip/grizzly

Clean-up changes not related to Quantum