Clean up.
Merge pull request #383 from nZEDb/dev

Clean up.