Clean up to make recent pull request lint
Merge pull request #874 from Samangan/develop

Clean up to make recent pull request lint