NXP-12256:  Remove unused code and add test case. 
bonus: gitignore mac files