Merge pull request #582 from JohnMai/anthonylim

Remove debug modes